Note Refactor